From 762d2c2fffdf5f22b8ae4779dcf7c4794ee521cc Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Tue, 31 May 2016 16:44:56 -0700
Subject: [PATCH] Pass -j1 on Travis

Looks like if we do things concurrently we hit the OOM killer, so let's not do
that!
---
 .travis.yml | 4 ++++
 Makefile.in | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 85f59b930..2aef32ba6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,10 @@ after_success: |
   git push -qf https://${TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages
 env:
   global:
+    # apparently we use too much memory and if there's more than one rustc then
+    # when compiling Cargo's unit tests some compilers will be randomly kill
+    # -9'd
+    - CARGOFLAGS=-j1
     - secure: scGpeetUfba5RWyuS4yt10bPoFAI9wpHEReIFqEx7eH5vr2Anajk6+70jW6GdrWVdUvdINiArlQ3An2DeB9vEUWcBjw8WvuPtOH0tDMoSsuVloPlFD8yn1Ac0Bx9getAO5ofxqtoNg+OV4MDVuGabEesqAOWqURNrBC7XK+ntC8=
 
 os:
diff --git a/Makefile.in b/Makefile.in
index 2d5a6e23f..aefb9cade 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -95,11 +95,11 @@ cargo-$(1): $$(CARGO) target/openssl/$(1).stamp
 	$$(CARGO) --version
 	$$(CARGO) build --target $(1) \
 		--manifest-path $(S)Cargo.toml \
-		$$(OPT_FLAG) $$(VERBOSE_FLAG) $$(ARGS)
+		$$(OPT_FLAG) $$(CARGOFLAGS) $$(VERBOSE_FLAG) $$(ARGS)
 
 test-unit-$(1): $$(CARGO)
 	@mkdir -p target/$(1)/cit
-	$$(CARGO) test --target $(1) $$(VERBOSE_FLAG) $$(only)
+	$$(CARGO) test --target $(1) $$(CARGOFLAGS) $$(VERBOSE_FLAG) $$(only)
 endef
 $(foreach target,$(CFG_TARGET),$(eval $(call CARGO_TARGET,$(target))))
 
-- 
2.30.2